OSDN Git Service

am e31fb21d: am f2b60c0f: resolved conflicts for merge of f8e4d1b7 to master
authorColin Cross <ccross@android.com>
Mon, 12 May 2014 23:29:01 +0000 (23:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:29:01 +0000 (23:29 +0000)
commit6e72d76c63c69701471d4ac245bbd43e112d63b0
treedb34eca2da5ec1662b262862fc44c323209fcb14
parentb7e745feced8c7a9001f977e2c35b8913b37fbf2
parente31fb21d57768ea4d13b40b395f49d8fffa62b4f
am e31fb21d: am f2b60c0f: resolved conflicts for merge of f8e4d1b7 to master

* commit 'e31fb21d57768ea4d13b40b395f49d8fffa62b4f':