tree fbcc904dd5b5e9eb33300074fde787b7892a940d
parent a764361d865a0417241e6eb681dbe90fc708fc1b
parent 54c2c65e4ea1d9ee134eb71703e5ce7860b6875e
author Bill Yi <byi@google.com> 1398862222 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398862222 +0000

am 54c2c65e: am a53cb80b: Merge commit \'f7d19f946f83684a894a797ebb531d647b0730c3\' into HEAD

* commit '54c2c65e4ea1d9ee134eb71703e5ce7860b6875e':