OSDN Git Service

am e21217af: (-s ours) am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return...
authorJohn Wang <johnwang@google.com>
Fri, 17 Jun 2011 00:20:06 +0000 (17:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Jun 2011 00:20:06 +0000 (17:20 -0700)
commit01c92ac2a475111bfd76c2b6e033aaa1447dc720
tree02a86dc22485fd8ce11695a5684f670154c34610
parent472ad61aef4f057220d16f5443dff53ece945cfd
parentcfa204826c5a0145b865cfbe5e0d6b8fdaa498b8
am e21217af: (-s ours) am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2

* commit 'e21217af6480c45212517a68b2b6e583c4dc27c9':
  Revert "Do not merge. Return null id for Non-phone device."