OSDN Git Service

resolved conflicts for merge of 22fb61c8 to lmp-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Tue, 9 Sep 2014 05:11:18 +0000 (22:11 -0700)
committerAndreas Gampe <agampe@google.com>
Tue, 9 Sep 2014 05:11:18 +0000 (22:11 -0700)
commit0f112b9b7df8c50120a80d321f0ffc3d3cf58d03
tree9c5386327ee2132387f1f548ff317de7f6f09b3e
parent1db531247b2ddd3b455b3e3827860555a28559d6
parent22fb61c87d9646ec0be3c7e501fec18ebf083bcc
resolved conflicts for merge of 22fb61c8 to lmp-dev-plus-aosp

Change-Id: Ib4de757227ede47d7bcb07c729057c0afb637ef7