OSDN Git Service

resolved conflicts for merge of b097c416 to stage-aosp-master
authorrepo sync <hamaji@google.com>
Tue, 21 Jul 2015 03:31:17 +0000 (12:31 +0900)
committerrepo sync <hamaji@google.com>
Tue, 21 Jul 2015 03:31:17 +0000 (12:31 +0900)
commit896754566fd2318814c18da447aa0ea5ee807e6a
treed5a2f91ed2b769e1ff79d4b773950cbb1d29f6ea
parent55fc58cb8f0a53151de48635c5f452bc10691e52
parentb097c416308912353e1b188f1d92dfd06e295f5d
resolved conflicts for merge of b097c416 to stage-aosp-master

Change-Id: I3e0732ee61e5de40c53ade70ee1d9f6a4c3e77d6