author | Elliott Hughes <enh@google.com> | |
Thu, 5 Dec 2013 19:37:29 +0000 (19:37 +0000) | ||
committer | Android Git Automerger <android-git-automerger@android.com> | |
Thu, 5 Dec 2013 19:37:29 +0000 (19:37 +0000) | ||
commit | 456e415b93d75233c1948a6398521128c2d5afef | |
tree | 95e5c7d59b500d03e891eb590341fc7eaae6a769 | tree | snapshot (tar.xz tar.gz zip) |
parent | 7f52a46619d31e8acf19c1f270256de06efe1cf6 | commit | diff |
parent | 14ec1b58869362f07ffdf7495cbba2f746da7b77 | commit | diff |
am 14ec1b58: am ceb670cf: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/bionic into klp-dev
* commit '14ec1b58869362f07ffdf7495cbba2f746da7b77':
* commit '14ec1b58869362f07ffdf7495cbba2f746da7b77':