OSDN Git Service

am 0421d0b1: Fix issue #18368417: 5.0 -> 5.1.
authorDianne Hackborn <hackbod@google.com>
Thu, 4 Dec 2014 22:07:08 +0000 (22:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Dec 2014 22:07:08 +0000 (22:07 +0000)
* commit '0421d0b115208b50015781b09f3661b65d72e858':
  Fix issue #18368417: 5.0 -> 5.1.


Trivial merge