Daniel Erat d3e3d8896e am c3f37589: Merge "Update instructions in IPowerManager.aidl." ...

* commit 'c3f37589e04a52c109c63f6411db444500d4f92c':
  Update instructions in IPowerManager.aidl.

2015-09-30 21:30:31 +00:00

..

java

am c3f37589: Merge "Update instructions in IPowerManager.aidl."

2015-09-30 21:30:31 +00:00

jni

am 899110f3: Merge "Add exported include dir for libandroid_runtime"

2015-09-28 21:23:57 +00:00

res

Import translations. DO NOT MERGE

2015-09-29 01:27:34 -07:00

tests

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00