| commit | 854c6ff923f9445af69caa9b6f658259df99cd94 | [log] [tgz] |
|---|---|---|
| author | Yoland Yan <yolandyan@google.com> | Fri Jan 06 21:26:24 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 06 21:26:24 2017 +0000 |
| tree | 4e8fd18f351adba5dadb0d6e2003625edd62cf8c | |
| parent | 0110021577ad60eeadf383dfa7e1ff8d94856dcf [diff] | |
| parent | 533d033fabdda41c9f5f9c3f759aa8366e122502 [diff] |
resolve merge conflicts of 2537ffdefc to marshmallow-cts-dev am: 533d033fab Change-Id: I74e7e7dd3e86f1fff1a03f51b99c70e5f55ab80f