OSDN Git Service

resolved conflicts for merge of 76fb6019 to lmp-dev-plus-aosp
authorStephen Hines <srhines@google.com>
Fri, 25 Jul 2014 18:53:48 +0000 (11:53 -0700)
committerStephen Hines <srhines@google.com>
Fri, 25 Jul 2014 18:53:48 +0000 (11:53 -0700)
commit8cac6317c5301ae1235fcb1e1befa4c6ca3ca185
tree35ee56ef560507ad0971aa0cda0b1656a4808394
parent8b605381493ad3421bb5f91c1b2cb14a22cb14e2
parent76fb6019feacda82ea3112cb0231860bfd916287
resolved conflicts for merge of 76fb6019 to lmp-dev-plus-aosp

Change-Id: Ifc9f9fa95dda1dbe60b3be35ef30d2ca707c72d5