tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 195bccd5381b4d5094f15772e43897a082fec078
parent c8b8b95fc108263dfe9882de56fa6f154aa69eb8
author Dharmesh Mokani <mokani@google.com> 1422685276 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685276 +0000

am c8b8b95f: am c59a9a3d: am 597a8ec8: am 6075170b: Changes corresponding to framework changes.

* commit 'c8b8b95fc108263dfe9882de56fa6f154aa69eb8':