OSDN Git Service

am 945ca8d4: (-s ours) am a2a8501e: am 9a4cf569: DO NOT MERGE
authorNicolas Prevot <nprevot@google.com>
Thu, 17 Jul 2014 18:28:46 +0000 (18:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Jul 2014 18:28:46 +0000 (18:28 +0000)
commitbff040f8f5bc0d59a9e4db9ee1ab14909b52ef05
tree56d7a1958ea12893c0298323085141f0e07928ae
parentad40b8e9f818bb86ec1e6c6e87c52c7c26a78758
parent1423ab75a43d5ad0c4f17c15b4eefa3357c88152
am 945ca8d4: (-s ours) am a2a8501e: am 9a4cf569: DO NOT MERGE

* commit '945ca8d4088bf87bd06a8f9529061bb6f6c52c18':