tree c215659d5c27956224d6fd3791c2cf3454a42d0b
parent 194f2e468d3bda0780c990e43c83d1ef6dd2f47d
parent 1a3708ec0fa2c05b1858ef0a87fae2e851307661
author Winson Chung <winsonc@google.com> 1392410230 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410230 +0000

am 1a3708ec: am 9ba343d7: (-s ours) am a78b25f8: (-s ours) DO NOT MERGE

* commit '1a3708ec0fa2c05b1858ef0a87fae2e851307661':