OSDN Git Service

am 53126416: DO NOT MERGE!
authorsmain@google.com <smain@google.com>
Wed, 25 Jun 2014 02:06:43 +0000 (02:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Jun 2014 02:06:43 +0000 (02:06 +0000)
commit5f4a2b83850868fa5898661cb2555e54023060c0
treea63985e3e3a50a97d72545a5aa6fdacc19d4cc8a
parent48371ca146fb7df270f74df9bdaac64b92edb02c
parent531264164a2cd24fa412b71782ef424a2d968028
am 53126416: DO NOT MERGE!

* commit '531264164a2cd24fa412b71782ef424a2d968028':
  DO NOT MERGE!