]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/platform-bionic.git/commitdiff
projects / android-sdk / platform-bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8f9198 dc6c2b7)
resolved conflicts for merge of dc6c2b77 to master
authorElliott Hughes <enh@google.com>
Fri, 18 May 2012 00:15:01 +0000 (17:15 -0700)
committerElliott Hughes <enh@google.com>
Fri, 18 May 2012 00:15:01 +0000 (17:15 -0700)
Change-Id: Ifab4573a825cf5caa7158d8888243bb8d5d01148


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