| commit | 4e2092b555b3ef3e5ea6e3eb798bca4b21e33dce | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Nov 20 18:57:29 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 20 18:57:29 2015 +0000 |
| tree | 4296f2c87f9ac51ea230750574bccb046638e19e | |
| parent | c6d365645f8315dc84f1e3253e575f454be460db [diff] | |
| parent | a3571bc9c9f16c58a49cbb080da97223c807b2f5 [diff] |
Merge "DO NOT MERGE Restore accidentally commented line" into marshmallow-cts-dev am: a3571bc9c9 -s ours * commit 'a3571bc9c9f16c58a49cbb080da97223c807b2f5': DO NOT MERGE Restore accidentally commented line