OSDN Git Service

Merge "resolved conflicts for merge of 45fed517 to mnc-dev" into mnc-dev
authorDirk Dougherty <ddougherty@google.com>
Wed, 13 May 2015 18:37:19 +0000 (18:37 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 13 May 2015 18:37:20 +0000 (18:37 +0000)
commit1b8b3a0000812f9935f33667b055a546228ebfb6
treef22f7c580d8d2b69152117c76754bf7da1db4c09
parent90c66e3ded4a91613b0c1760ab2ef15e0d118a36
parent40e6ac91665b57cf6e794e731d1b1c7142175abe
Merge "resolved conflicts for merge of 45fed517 to mnc-dev" into mnc-dev