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)
commit741e566b8a80f271bf4d09579e8e3fac8f92b954
tree13bfd355ec2c16bdc2595fdb65c625babd486c9c
parent498720b2a5b4f5dfd0c514a83ffd690c64e824cd
parent57504548c67479505972d32edf2d5a10539ed8e6
resolved conflicts for merge of 57504548 to lmp-dev-plus-aosp

Change-Id: I17dba9a68f3af09033cd0a5a221bb8474aa18502