OSDN Git Service

resolved conflicts for merge of b2eb09a9 to lmp-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Sun, 31 Aug 2014 05:30:48 +0000 (22:30 -0700)
committerElliott Hughes <enh@google.com>
Sun, 31 Aug 2014 05:30:48 +0000 (22:30 -0700)
commit1a96db3e8ea0b2a488a068c6f46f7e7ca2e5fc96
tree901df04380782787be93e0204db3ac277dffd58a
parent94ea04c50ac3ca59245999bfe302066e8b5c1c84
parentb2eb09a9ed9e08d9e49f4245d1959b2ca3fbaaf8
resolved conflicts for merge of b2eb09a9 to lmp-dev-plus-aosp

Change-Id: I0208958d78d6d7bc8c41568aa9abee15605b951e