| commit | 5736ae2f0c48a7754db70d1f0574ff298c2b4ed8 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Mon Apr 18 22:26:04 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 18 22:26:04 2016 +0000 |
| tree | 508b2bdda9cbfdbac4486bb24799df718121b0b9 | |
| parent | 8df18a1f2167bd84b24c161a1d1e922122569876 [diff] | |
| parent | 2d14f2ae0276f2d807bee9eb56bfc4e274e934dd [diff] |
Merge "DO NOT MERGE: Fix breakages" into lollipop-mr1-cts-dev am: 2d14f2a -s ours * commit '2d14f2ae0276f2d807bee9eb56bfc4e274e934dd': DO NOT MERGE: Fix breakages Change-Id: I312b07be46baec8f0971a460445a6084358b199f