projects / android-sdk / platform-bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d6f5e6 7915b22)
am 7915b22e: am a4b20d71: am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:30:58 +0000 (12:30 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:30:58 +0000 (12:30 -0700)
* commit '7915b22e8f70b80a9fc2c41f9734194c58b546fc':


Trivial merge
Integrated Android Product SDK Hardened Software - Mirrored and maintained from http://omapzoom.org/?p=platform/bionic.git;a=summary.