OSDN Git Service

am 5ba82714: am 3012b393: am e83f3072: am 8b73fc1a: (-s ours) am 2b4bc305: Merge...
authorGeremy Condra <gcondra@google.com>
Mon, 12 Nov 2012 20:16:33 +0000 (12:16 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Nov 2012 20:16:33 +0000 (12:16 -0800)
commit09c5e2474dad4fd043c6c18d7f366dbcb3066eef
tree5d1d032bfbda149c22873c7d40a148cc0c66bd0e
parent172b9e26bd6ea7099919564a181ac95e9baedddb
parent5ba82714952f0425dd1c697ec1295ac4cd3ad9e5
am 5ba82714: am 3012b393: am e83f3072: am 8b73fc1a: (-s ours) am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev

* commit '5ba82714952f0425dd1c697ec1295ac4cd3ad9e5':
  DO NOT MERGE Control access to tts objects