| commit | d25522b2dc2395289dfb83b5873a375f9e1d4dd9 | [log] [tgz] |
|---|---|---|
| author | Jin Qian <jinqian@google.com> | Thu Jul 06 16:32:47 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 06 16:32:47 2017 +0000 |
| tree | 0d46ff8fff09b5879bb0d09645aa626d6d4567c8 | |
| parent | 4b8654d9b7d99d1b2b734082db7591424f79a82c [diff] | |
| parent | bedbcad1de4a5d809e67e7a58000fbceb31dd732 [diff] |
Merge changes from topic 'am-52eed220ada34c3aba959fcbb20dfeab' into oc-dr1-dev-plus-aosp am: bedbcad1de -s ours Change-Id: I1c33bc2650c4122ea7b0cc963a5558257433c6aa