| commit | c78724f805d6bf57d7d02e23c18ecad1e0828b96 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Mon Apr 18 20:26:12 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 18 20:26:12 2016 +0000 |
| tree | a655f2d88e3e7c94f9e4cc8a07d6c112bb0b9b9e | |
| parent | 803b37fc881dcfdb6a1587a70faedeac3cdbbfa1 [diff] | |
| parent | 9434cd31e913df4e5fb17330cac6a78981b951ea [diff] |
Merge "DO NOT MERGE: Fix build break" into marshmallow-cts-dev am: 8df18a1 -s ours am: 5aa45ad am: a8d97ea am: 9434cd3 * commit '9434cd31e913df4e5fb17330cac6a78981b951ea': DO NOT MERGE: Fix build break Change-Id: Ia1145d0cd71c1b628a3af9a5fea9f43cd5d55d9b