tree bb1dc307c2e50e5df94e485cd50018c5c2ffe663
parent 529f7356fe72dfac55f243800338212ee7fb2bff
parent 2ff92be6268d654918a6ef8ab91dec9f3c999f6e
author Chris Craik <ccraik@google.com> 1403557081 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403557081 +0000

am 2ff92be6: am 30fd7d2d: resolved conflicts for merge of c78082b6 to master

* commit '2ff92be6268d654918a6ef8ab91dec9f3c999f6e':