commit | 6a6145036b497901a9d7d4a842064fc4be730671 | [log] [tgz] |
---|---|---|
author | Tina Zhou <tinazh@google.com> | Fri Jan 06 23:41:33 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jan 06 23:41:33 2017 +0000 |
tree | b61387237e3481fde64851f9a619e63542fd180e | |
parent | 206b73f603f41a8fcbe036660c1f1d68cd732071 [diff] | |
parent | 48850d1d5734b9686051156bd4cda888d2d8b31a [diff] |
Revert "resolve merge conflicts of 2537ffdefc to marshmallow-cts-dev" am: 48850d1d57 -s ours Change-Id: Ia0bb87f5a1dde2ad014d2e91bddf1a00b3a9e6dc