| commit | 2a95bdbe1a0d552c3abc15975f1cfa7d6d4aebc2 | [log] [tgz] |
|---|---|---|
| author | Robert Ly <robertly@google.com> | Fri Feb 11 14:02:00 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 11 14:02:00 2011 -0800 |
| tree | 42fa19b35b019b6698cac93ef94cec9f6b5133e4 | |
| parent | c9dd8a8479d4965cfd166181b96baa9f1f86ca58 [diff] | |
| parent | 120a181976e7315be61a1a0e052148a43959a87c [diff] |
am 65bdc59e: resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp * commit '65bdc59ea0e5c1cbc97ea2b288b71d48de173a79': Doc change: nfc dev guide