Jeff Sharkey 09aa0cf6f6 Merge "Better --unplugged support when dumping battery."

2013-04-30 22:14:12 +00:00

..

java

Merge "Better --unplugged support when dumping battery."

2013-04-30 22:14:12 +00:00

jni

Merge "Handle Surface::lock errors in TextureView Bug #8689535"

2013-04-30 18:58:17 +00:00

res

Import translations. DO NOT MERGE

2013-04-29 22:34:34 -07:00

tests

resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp

2013-04-29 23:09:03 -07:00