OSDN Git Service

resolved conflicts for merge of 57504548 to lmp-dev-plus-aosp
authorIan Rogers <irogers@google.com>
Thu, 14 Aug 2014 01:23:21 +0000 (18:23 -0700)
committerIan Rogers <irogers@google.com>
Thu, 14 Aug 2014 01:23:21 +0000 (18:23 -0700)
Change-Id: I17dba9a68f3af09033cd0a5a221bb8474aa18502


Trivial merge