author | David 'Digit' Turner <digit@google.com> | |
Mon, 11 Jul 2011 19:39:06 +0000 (21:39 +0200) | ||
committer | David 'Digit' Turner <digit@google.com> | |
Mon, 11 Jul 2011 19:39:14 +0000 (21:39 +0200) | ||
commit | 3a13102637c8be53edf28f96598ac11aaa3e14df | |
tree | a8e77af69edd9db40c53b31d1c36b5cae7a2b5c6 | tree | snapshot (tar.xz tar.gz zip) |
parent | 57aadbb096a118dd33f9f16c67bd18dbb6b92c4a | commit | diff |
parent | 50a83255d80f98b857c3f72dd2225d4bbc720ca3 | commit | diff |
resolved conflicts for merge of 50a83255 to gingerbread-plus-aosp
Change-Id: Idf1971120bbdd52676f95aa3aa69f62342dc012e
Change-Id: Idf1971120bbdd52676f95aa3aa69f62342dc012e
libc/Android.mk | diff1 | | diff2 | | blob | history |