| tag | febb1806293cf56fe185c96a559a7cf3a22ceeeb | |
|---|---|---|
| tagger | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 20 11:52:38 2016 -0700 |
| object | 220505e6fe2c1975a84b50a6dcf1d6c1a4f552c6 |
Android 7.1.0 release 2
| commit | 220505e6fe2c1975a84b50a6dcf1d6c1a4f552c6 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Wed Aug 17 23:34:48 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 17 23:34:48 2016 +0000 |
| tree | 4595df105c02dfa9b619e9a1efd82eb3ec5cf747 | |
| parent | 29d15c5fe48a136e55bf6f639e90dc569a36254a [diff] | |
| parent | 000c33c8eb1f4c739d11347f3fd1923e9f381101 [diff] |
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f21973d99 am: ab159ee14e am: e0cb79f1bc am: 3197a71063 am: ac2655b5cb am: bf7bc974e5 am: 000c33c8eb Change-Id: I5b4d1e7d07d2ebd5c2c488b3dd3d76e1dcb6d93a