OSDN Git Service

Merge "resolved conflicts for merge of edf44562 to mnc-dev" into mnc-dev
authorRich Slogar <rslogar@google.com>
Thu, 30 Apr 2015 21:27:44 +0000 (21:27 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 30 Apr 2015 21:27:45 +0000 (21:27 +0000)
commit24863faa05dc8934f790e13f8cf153c0edb4a32a
treea88f37a0cc0a9229fa2ad327c25f9c07595944bd
parent8724d359bfe1f95fd4c558b55069e1624b461f28
parent0820394f7e4ca089a4210f21ed427871d96c793e
Merge "resolved conflicts for merge of edf44562 to mnc-dev" into mnc-dev