OSDN Git Service

Merge "resolved conflicts for merge of 1107c8f3 to mnc-dev-plus-aosp" into mnc-dev...
authorRoland Levillain <rpl@google.com>
Mon, 29 Jun 2015 13:54:34 +0000 (13:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 29 Jun 2015 13:54:35 +0000 (13:54 +0000)
commitf16ff629eec3991ccfc48792df52565b04b55dc6
treebda2195e71df677723efc8739a37440e9b7ce69d
parent2c22efd4a3ddb44eda589b63ca420aedabb29a37
parent4a666d3892c0b5f5d969a0ad71208f2253068e97
Merge "resolved conflicts for merge of 1107c8f3 to mnc-dev-plus-aosp" into mnc-dev-plus-aosp