OSDN Git Service

am 89ab5057: am 925b1a0c: am cfaa646d: am ac1dd2f6: am 87a2300f: Merge "workaround...
authorSpike Sprague <spikuru@google.com>
Tue, 16 Sep 2014 15:21:34 +0000 (15:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Sep 2014 15:21:34 +0000 (15:21 +0000)
* commit '89ab5057339dc38a9290acb24755868a0d31700d':


Trivial merge