| commit | 68da51d735a6a0f2fbea639237c38d7d3b7ff2ed | [log] [tgz] |
|---|---|---|
| author | Android Merger <android-build-merger@google.com> | Fri Jan 06 21:26:32 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Jan 06 21:26:32 2017 +0000 |
| tree | 4e8fd18f351adba5dadb0d6e2003625edd62cf8c | |
| parent | 0110021577ad60eeadf383dfa7e1ff8d94856dcf [diff] | |
| parent | 854c6ff923f9445af69caa9b6f658259df99cd94 [diff] |
Merge "resolve merge conflicts of 2537ffdefc to marshmallow-cts-dev am: 533d033fab" into nougat-cts-dev