OSDN Git Service

am 3a658cc5: am 2ecd9fc9: Merge "Fix another build break."
authorHui Shu <hush@google.com>
Mon, 12 May 2014 23:28:41 +0000 (23:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:28:41 +0000 (23:28 +0000)
commit3bc74fdf463aa34c6f4747a49ad6ff929ae4c71a
treedb34eca2da5ec1662b262862fc44c323209fcb14
parent68d13a8feff3c9b70192f8936e6f2c50f342a621
parent3a658cc545ca746c28dc9c1a9cf484b9ab06806d
am 3a658cc5: am 2ecd9fc9: Merge "Fix another build break."

* commit '3a658cc545ca746c28dc9c1a9cf484b9ab06806d':