| commit | c9932ae014923060d0a45257069d3922b3123668 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Sun Apr 17 06:29:19 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Apr 17 06:29:19 2016 +0000 |
| tree | a06ed026acce432df0bd62efcfa791f3e4680054 | |
| parent | 1a8817eb8f198f969b4ecbae9cd6001ad59592fe [diff] | |
| parent | 7ff34921588f534e623c2bdd705e4376ec153b42 [diff] |
Merge "Merge "DO NOT MERGE: fixed breakage" into lollipop-mr1-cts-dev am: 90cb6ab -s ours" into marshmallow-cts-dev am: 7ff3492 -s ours * commit '7ff34921588f534e623c2bdd705e4376ec153b42': DO NOT MERGE: fixed breakage Change-Id: If0eb5f6cab9ce0181ae282c406a24f9e6f94fb56