OSDN Git Service

Merge "resolved conflicts for merge of f0c4f0dd to mnc-dev" into mnc-dev
authorWei Liu <luciferleo@google.com>
Wed, 13 May 2015 16:59:53 +0000 (16:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 13 May 2015 16:59:54 +0000 (16:59 +0000)
commitb9599750235985e92ed393bbbd0f59e31ec25b01
tree443aeb908fbccc7e8e71602b236a53b5a21cc4c0
parentec6e7a662db44d32bb3c8676e7c9e87dea86075f
parent8e4799ad456c972cc340d3f484afd69b2f14a761
Merge "resolved conflicts for merge of f0c4f0dd to mnc-dev" into mnc-dev