tree c74c5c440a1a421ab9ba84a8dc4dba0a99c28c7e
parent 511f9dfce6b20ef36d8ff27043fe52a25a869339
parent 51160caf9cb3f85a5ad3e89cbf794563c017c7af
author The Android Automerger <android-build@google.com> 1427409488 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427409488 +0000

am 51160caf: (-s ours) am aae99eaa: am b2b58c8f: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev

* commit '51160caf9cb3f85a5ad3e89cbf794563c017c7af':