| commit | 65b6b83effe42aa5ffbf80858e8a542426114872 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Oct 19 19:25:19 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 19 19:25:19 2017 +0000 |
| tree | 7c88ae26d6eea694e00e9f553461399577d9c360 | |
| parent | fb055698091f4a550e3089e55396d025d755f023 [diff] | |
| parent | 75fc6471467c0f30ebc82b930db8b631711a7ea4 [diff] |
DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 Change-Id: I20c27db686870c2ac0d383e1646040f9ddf089ed