OSDN Git Service

resolved conflicts for merge of a5087148 to lmp-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Sat, 4 Oct 2014 17:03:08 +0000 (10:03 -0700)
committerElliott Hughes <enh@google.com>
Sat, 4 Oct 2014 17:03:08 +0000 (10:03 -0700)
commit2e345351b339e7196b198adc14e3fbb73722e298
treee020a7a75b3375c62300296aa49ae9fc94bf454c
parentb4954dc3849357f9e54c3a435c4455271fd631b0
parenta508714800242b294291060641ed35d719bdc857
resolved conflicts for merge of a5087148 to lmp-dev-plus-aosp

Change-Id: Ic6b352650a7dec53cdd681d0f0b8ba4278e560d3