OSDN Git Service

am afcf9bbd: am e5b45eaf: (-s ours) Merge "Build broken." into klp-dev
authorBaligh Uddin <baligh@google.com>
Mon, 7 Oct 2013 01:52:40 +0000 (18:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Oct 2013 01:52:40 +0000 (18:52 -0700)
commitf5b77cb72f028b663ea3117c9e3185a76658f049
tree0af02e2c50b1d11a43c0223d7548504bcf52acb7
parent6137316bb6e5b727a63ff4505828d3334aa8d4b7
parentafcf9bbdef0cec0a5bbdc399b6fb4f9c09aaa648
am afcf9bbd: am e5b45eaf: (-s ours) Merge "Build broken." into klp-dev

* commit 'afcf9bbdef0cec0a5bbdc399b6fb4f9c09aaa648':
  Build broken.