OSDN Git Service

am ee0ff061: am fcb9033a: am c85a63c5: am 1beeb0aa: Merge "Revert "Workaround for...
authorMichael Jurka <mikejurka@google.com>
Thu, 23 Oct 2014 17:30:58 +0000 (17:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Oct 2014 17:30:58 +0000 (17:30 +0000)
* commit 'ee0ff061454e409e48f3d076bebe5f1a4f3ca19a':


Trivial merge