tag | f6458e2d3eabfdce128622be188627d1fe0e919a | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Feb 27 17:02:39 2017 -0800 |
object | 3d69581bb002b294916ad98b3b415629a08d8fc8 |
Android Wear 7.1.1 Release 1 (NXG12F)
commit | 3d69581bb002b294916ad98b3b415629a08d8fc8 | [log] [tgz] |
---|---|---|
author | Tom Cherry <tomcherry@google.com> | Thu Sep 03 15:33:17 2015 -0700 |
committer | Tom Cherry <tomcherry@google.com> | Thu Sep 03 15:33:17 2015 -0700 |
tree | eb2b66150204289ce319d509d62555e835452c56 | |
parent | 3f7c9ac1972c46ca3ad404f4c0a28e2243b62763 [diff] | |
parent | 4563938e1a6429d635588a1316e985c3ee4fac50 [diff] |
resolved conflicts for merge of 4563938e to mnc-dr-dev-plus-aosp Change-Id: I4f001f697a3fe312a535ce8f3b78d32881327314