OSDN Git Service

resolve merge conflicts of 24e38ab to stage-aosp-master
authorJohn Reck <jreck@google.com>
Tue, 23 Aug 2016 22:56:52 +0000 (22:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Aug 2016 22:56:52 +0000 (22:56 +0000)
commitf929ef6cbd711b07b3116af251490512c1681fae
treebd989f81596852da1727cd68b11ecd6804586a7f
parent7914092dedcacaf7f68eeaf9495c411cc8553484
parent621fb590e3789c26e0ad536220d1d2c9e80e1f93
resolve merge conflicts of 24e38ab to stage-aosp-master
am: 621fb590e3

Change-Id: Ia1b617a13012a8d475feb91bfbabb6ace264a29e