OSDN Git Service

am 89cea037: am 49798939: border UI editor
authorJohn Hoford <hoford@google.com>
Thu, 22 Aug 2013 23:09:45 +0000 (16:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 Aug 2013 23:09:45 +0000 (16:09 -0700)
* commit '89cea0376a0d012c6c7f5cf7a0cd6b0e739c9a2a':
  border UI editor


Trivial merge