| commit | b3103093a449ba5504b255a584f4fe9968cfda71 | [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 | a87793fcc1497b4365964e931ea59dd8c056a3a7 | |
| parent | cbafbe7c3e4da0a9cccfddd07f78f2e74a7870cb [diff] | |
| parent | 65bdc59ea0e5c1cbc97ea2b288b71d48de173a79 [diff] |
am 65bdc59e: resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp * commit '65bdc59ea0e5c1cbc97ea2b288b71d48de173a79': Doc change: nfc dev guide