tree 2eb4c424cdfc3c5a8d2118786791279a9f193cb4
parent a685b3bbd4d1444a4c71f28ad5200faaf3d7e97c
parent 266286963b6481f8f1306b7ea3cd3037d9c2c3ae
author Clay Murphy <claym@google.com> 1392233013 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392233013 +0000

am 26628696: am 3843e942: am 418b74d4: Merge "Docs: Adding link to manual and English required Bug: 11584879"

* commit '266286963b6481f8f1306b7ea3cd3037d9c2c3ae':