OSDN Git Service

am 5dc434e2: am 892c8f3d: (-s ours) am 09848031: am b8160401: Merge "Fix the build...
authorSvetoslav Ganov <svetoslavganov@google.com>
Thu, 5 Dec 2013 23:04:37 +0000 (15:04 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 23:04:37 +0000 (15:04 -0800)
commita64a9cdc9aac0e8be94d443ddda9f09370571a8a
tree400823bb82f52890fcc361db78b38b2b5d3bd1f3
parent90f75514360ec15da4ed401b5932840f32b84089
parent5dc434e21e1f8f621e46a8a427247a355db042ef
am 5dc434e2: am 892c8f3d: (-s ours) am 09848031: am b8160401: Merge "Fix the build" into klp-dev

* commit '5dc434e21e1f8f621e46a8a427247a355db042ef':