| commit | ab3d5af8d26b55e5fc34092265d4ba28e8652eb7 | [log] [tgz] |
|---|---|---|
| author | Pawin Vongmasa <pawin@google.com> | Fri Aug 19 18:01:11 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 19 18:01:11 2016 +0000 |
| tree | 6dced01431a5aea2ec27fb5161d06b0127c44c70 | |
| parent | d2cfa11dc21f8af74062d84be9eb8aa520d0268a [diff] | |
| parent | 2c4162e822c8ba5777ecdbd2cd82688e463e4140 [diff] |
DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65 am: 2a21f09fff -s ours am: 83cf293b73 -s ours am: 45cd2f896b am: 52f7319fc0 am: ab5c805aec -s ours am: 1dd4973234 am: 484d229a3c am: 2c4162e822 Change-Id: I3baeab891856725b93c22c11ea0a0b6f4bc8ddbb