OSDN Git Service

resolved conflicts for merge of 04c9683a to lmp-mr1-dev-plus-aosp
authorJesse Hall <jessehall@google.com>
Fri, 31 Oct 2014 22:41:03 +0000 (15:41 -0700)
committerJesse Hall <jessehall@google.com>
Fri, 31 Oct 2014 22:53:38 +0000 (15:53 -0700)
commit3170581704fa59a8672262c0e6c68f455d470214
tree8dbf5884b6774cbf60cce9dce8d850d005d85a60
parentbc11bbf2f0bd38c0f271cb95c138a48d5d9a085b
parent04c9683aa1bb962bef3dce7f3cfd389a458133a2
resolved conflicts for merge of 04c9683a to lmp-mr1-dev-plus-aosp

Change-Id: I83fdaf504ca37536c277a146c1d624e44cfe11b0