OSDN Git Service

am a6947c41: am 045ed665: am 8e904d56: (-s ours) am 785d764b: Merge "More on issue...
authorDianne Hackborn <hackbod@google.com>
Fri, 7 Mar 2014 18:25:29 +0000 (18:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Mar 2014 18:25:29 +0000 (18:25 +0000)
* commit 'a6947c418129acc0815aac8aee86be0db5360232':
  More on issue #12031685 (DO NOT MERGE)


Trivial merge