Steven Moreland 845b750fd5 Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master am: 3f378940c2 am: 93d8497094 am: 29327cbed9 ...

am: 7de64d2771

Change-Id: Id59a9457ba34bce71a2bba579ac9b7cf452699da

2017-08-11 20:31:08 +00:00

..

java

Merge "Camera: fix legacy device CTS failure" into oc-mr1-dev am: 0cfad57566

2017-08-11 20:03:53 +00:00

jni

Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master am: 3f378940c2 am: 93d8497094 am: 29327cbed9

2017-08-11 20:31:08 +00:00

proto/android

This cl implements CommandSection and use it to add procrank.proto Section

2017-08-02 16:33:17 -07:00

res

Merge "Change SystemApi as per API council feedback" into oc-mr1-dev

2017-08-11 18:06:46 +00:00

tests

Use cpu freq times to calculate power consumed by an uid.

2017-08-11 00:04:50 -07:00