am add274a7: (-s ours) Merge "DO NOT MERGE: Harden Device.getDeviceId()" into honeycomb-mr1

Browse Source

* commit 'add274a704cf95b39e02cc0cda4943ffe0d9c5ee':
  DO NOT MERGE: Harden Device.getDeviceId()

...

This commit is contained in:

Andy Stadler 2011-03-07 17:39:09 -08:00 committed by Android Git Automerger

parent 7983891c4c add274a704

commit d40b344fe0

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available