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':
This commit is contained in:
Elliott Hughes 2013-12-05 22:50:00 +00:00 committed by Android Git Automerger
commit a19860fa38

Diff Content Not Available