Lei Yu 240a70f1e5 Merge "Write currentDuration into Parcel" into oc-mr1-dev ...

am: bd6ff3d3e5

Change-Id: Ibaf3f44a9449a4f92abf3359fba8329f1cbca245

2017-08-14 22:38:04 +00:00

..

java

Merge "Write currentDuration into Parcel" into oc-mr1-dev

2017-08-14 22:38:04 +00:00

jni

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

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

proto/android

…

res

Import translations. DO NOT MERGE

2017-08-11 20:08:11 -07:00

tests

Merge "Write currentDuration into Parcel" into oc-mr1-dev

2017-08-14 22:28:26 +00:00