OSDN Git Service

resolved conflicts for merge of 50e7d733 to klp-modular-dev-plus-aosp
authorBrian Carlstrom <bdc@google.com>
Tue, 24 Jun 2014 21:09:49 +0000 (14:09 -0700)
committerBrian Carlstrom <bdc@google.com>
Tue, 24 Jun 2014 21:09:49 +0000 (14:09 -0700)
commit7c256eada7a8a8eb81296b0b992cf6b69eda75f1
treed09086a1bb1b3b4a095fcbe342ce7396902738a3
parentb133d43eee6b759b8117c5b1a2a2a2df8c6acd4f
parent50e7d733f387cca7a3105431ed53539e3a57aa2c
resolved conflicts for merge of 50e7d733 to klp-modular-dev-plus-aosp

Change-Id: I7f12783da2f656fd2b8d53de737399b3f7f6b524