Mady Mellor 12021f5020 Merge "Children should have backgrounds" into nyc-dev ...

am: 31e49b0964

* commit '31e49b0964cfba0b6b91e8ae67cbc04730098569':
  Children should have backgrounds

Change-Id: I1f68467af9048b93631c33243f4a2dd2e67ccf81

2016-05-24 21:08:17 +00:00

..

java

Merge "Children should have backgrounds" into nyc-dev

2016-05-24 21:08:17 +00:00

jni

Fix AudioTrack and AudioRecord documentation

2016-05-23 17:36:43 -07:00

res

Merge "Children should have backgrounds" into nyc-dev

2016-05-24 21:08:17 +00:00

tests

Merge "Fix parsing of kernel wakelocks" into nyc-dev

2016-05-20 17:23:08 +00:00