OSDN Git Service

am 456e415b: (-s ours) am 14ec1b58: am ceb670cf: Merge branch \'klp-dev\' of https...
authorElliott Hughes <enh@google.com>
Thu, 5 Dec 2013 22:50:00 +0000 (22:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 22:50:00 +0000 (22:50 +0000)
commita19860fa3867ecb745446e9119c8f97d3ea9aeef
tree5fb8d03410cf45719fa37b662fcd5683b89a60c3
parent3e0bbc4df62ab281b446a33330808ce05d43acb9
parent456e415b93d75233c1948a6398521128c2d5afef
am 456e415b: (-s ours) am 14ec1b58: am ceb670cf: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/bionic into klp-dev

* commit '456e415b93d75233c1948a6398521128c2d5afef':