| commit | 67183fe838b1400139988a931ed4d6a6853d2199 | [log] [tgz] |
|---|---|---|
| author | David Gross <dgross@google.com> | Wed Jun 15 21:08:38 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 15 21:08:38 2016 +0000 |
| tree | 309642c597cd94cd8f66da9cf69bbe5794a2059e | |
| parent | e28b22f8ee26b2902ff7567fa8acb02557a912d4 [diff] | |
| parent | 0c865d6a7f1c62dcd4a2c67a7a789b06cf2755f2 [diff] |
Revert \"resolve merge conflicts of d9547d9 to stage-aosp-master\" am: 0c865d6a7f Change-Id: Ic4b2447d7fdcef2de15e6db69d6fb30eb1391e53