tree b74145efe3918e5042721d551bf330860afd3e39
parent bc5fc101ade4099b5c19186120edf78c03781de8
parent 7fe7bce52f806c18d933e992fee18fa77e06d13a
author Narayan Kamath <narayan@google.com> 1508441903 +0000
committer android-build-merger <android-build-merger@google.com> 1508441903 +0000

DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3  -s ours am: e1257bad6e  -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 am: 9800d5d074  -s ours am: c995780ded am: 10d3ff2004 am: 5bccb55338
am: 7fe7bce52f

Change-Id: I500587ac26d3b5420598520ee196cf696b39f4f9