OSDN Git Service

resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp
authorSanket Padawe <sanketpadawe@google.com>
Fri, 10 Oct 2014 03:19:59 +0000 (20:19 -0700)
committerSanket Padawe <sanketpadawe@google.com>
Fri, 10 Oct 2014 03:19:59 +0000 (20:19 -0700)
Change-Id: I3246a5d50f0fa2e324b7c6119a365f8ee9ed2e80


Trivial merge