OSDN Git Service

Merge \\\"resolve merge conflicts of ac5b340 to nyc-dev\\\" into nyc-dev am: 6ec78a64...
authorDaniel Yu <dsyu@google.com>
Tue, 28 Jun 2016 16:42:11 +0000 (16:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Jun 2016 16:42:11 +0000 (16:42 +0000)
commitf5b7c67048f19eb03345538efb6d19238170b043
treea18e4d02b1333178fe09ee74ebfe89f93c4dcb0d
parentff7e594dd1c7b929f8f5fe905360f94b8b9706f4
parenta7338f1467aff18a31c3f4c09047f2580066b31c
Merge \\\"resolve merge conflicts of ac5b340 to nyc-dev\\\" into nyc-dev am: 6ec78a6458 am: 82bd5246e7
am: a7338f1467

Change-Id: I7d5f58b1bb4467d3f111baebb1cf5dcb5a7da6e8