tree cc7a96067c633d483d0dcd3f974e2c53606d36ec
parent 78abd16eeb2dcceb9f755e49a7085f82f9bace53
parent a123bb4bf7aea7062f4920b2d07e22bb6b5e0555
author Bill Yi <byi@google.com> 1398819180 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398819180 +0000

am a123bb4b: am fad7414f: Merge commit \'eb168aca05a39029e71e8d517fc1290bb3163534\' into HEAD

* commit 'a123bb4bf7aea7062f4920b2d07e22bb6b5e0555':