commit | 31fc25a845af88b3d1d1390d7fc07cb26416442e | [log] [tgz] |
---|---|---|
author | Robert Ly <robertly@google.com> | Tue Oct 18 11:12:28 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 18 11:12:28 2011 -0700 |
tree | a574c2c0504d5cb70f40ec2b4168d22064ce0aa7 | |
parent | 39617b0036d726012891086080f47237fd64a5f4 [diff] | |
parent | 1ff392128dfb802fe58e90ba23ed6138b1cd1a64 [diff] |
am 1ff39212: Merge "cherrypick from master - docs: nfc updates Change-Id: Iaa782911f14b11bc896ac9ef06db2c43104d1dac" into ics-mr0 * commit '1ff392128dfb802fe58e90ba23ed6138b1cd1a64': cherrypick from master - docs: nfc updates Change-Id: Iaa782911f14b11bc896ac9ef06db2c43104d1dac