OSDN Git Service

resolved conflicts for merge of bf3cc9e0 to mnc-dev-plus-aosp
authorRoland Levillain <rpl@google.com>
Fri, 7 Aug 2015 21:12:22 +0000 (22:12 +0100)
committerRoland Levillain <rpl@google.com>
Fri, 7 Aug 2015 21:12:22 +0000 (22:12 +0100)
commita0c02163d4f4e232457a82327381e0a34443110d
treecdf654f58f92e2fc7aa4ecb2cc4dae5b5cacd474
parentc9ed937a8921e77941271b3e7c75dfeb3a14a53b
parentbf3cc9e0384a55c37ed8380beff370c373efbe91
resolved conflicts for merge of bf3cc9e0 to mnc-dev-plus-aosp

Change-Id: I6079eac15e82065c437391ea5d7491226925c066