| commit | a30f9f3ab4e0e42e02540518dd37b352257cd98d | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Aug 30 13:58:51 2012 -0700 |
| committer | Ying Wang <wangying@google.com> | Thu Aug 30 13:58:51 2012 -0700 |
| tree | b2a0c0a27187eb7ec0cf12b63c7b101b061b39fb | |
| parent | 06b3293d5af3454a39681cfd659271551354b8a0 [diff] | |
| parent | 501c5d48c9b61bd981c809dacb63d06e666adc8c [diff] |
Merge commit '501c5d48' into manualmerge Conflicts: Android.mk Change-Id: If0a6b6475ac908a22ece23d43d1011f8d20ceb43