Jorim Jaggi 526694ea52 resolve merge conflicts of 3c1b0f0 to master ...

Change-Id: I2314728cba47c28ff580f4dfc69868f8cb5ff5db

2016-08-03 16:23:28 +00:00

..

java

resolve merge conflicts of 3c1b0f0 to master

2016-08-03 16:23:28 +00:00

jni

Merge "Unicode: specify destination length in utf8_to_utf16 methods"

2016-08-02 18:48:19 +00:00

res

Merge "Move @hide and @SystemApi to <public> tag"

2016-08-02 23:41:46 +00:00

tests

Merge "Have BatteryStats track and report the running wakelocks."

2016-08-03 01:49:50 +00:00