Jose Lima 3be15cb39b am 41c2d2ce: Merge "resolved conflicts for merge of 6c45157c to master" ...

* commit '41c2d2cec3f46b28f535e9cd7f5b9da02280ccfe':
  Added isGame application tag to the manifest

2014-03-24 15:38:02 -07:00

..

android

am 41c2d2ce: Merge "resolved conflicts for merge of 6c45157c to master"

2014-03-24 15:38:02 -07:00

com

Battery stats: wake locks, radio active, cleanup.

2014-03-24 13:36:46 -07:00

jarjar-rules.txt

…

overview.html

…