OSDN Git Service

Merge \"resolve merge conflicts of afed6f8 to nyc-dev\" into nyc-dev
authorfionaxu <fionaxu@google.com>
Thu, 9 Jun 2016 02:39:54 +0000 (02:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Jun 2016 02:39:54 +0000 (02:39 +0000)
commite285ab3aaeed9345b3a43d0a931c46ff326aba26
treecedb4e73313019ee56e5ca28908d23ea4efda793
parent268717370a9db1b7e4e35eb649d77d4f3fa96882
parent0c4f1c7e5cf66d0a24ef7b39991c3ec209dc6f31
Merge \"resolve merge conflicts of afed6f8 to nyc-dev\" into nyc-dev
am: 0c4f1c7e5c

Change-Id: I46be8494c88f03768e20bb702383f78cf38c1115