OSDN Git Service

Merge "resolved conflicts for merge of f993a9c4 to mnc-dev-plus-aosp" into mnc-dev...
authorMiao-chen Chou <mcchou@google.com>
Wed, 29 Jul 2015 22:27:37 +0000 (22:27 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 29 Jul 2015 22:27:37 +0000 (22:27 +0000)
commit9021076e4536d120e6010988eb9f17363afc6bb5
tree231ee838042c29cd5cd38fa6993384c31a774a9f
parent3feea42be114f26bc983b1af0228e3e109960196
parenta5db1d45cec965537568e041d39ad96a7e24ee59
Merge "resolved conflicts for merge of f993a9c4 to mnc-dev-plus-aosp" into mnc-dev-plus-aosp