am c388844d: (-s ours) am 234e42df: DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*

Browse Source

Merge commit 'c388844d50a67ecd8eb93d29d618bae1fa3a3c5d'

* commit 'c388844d50a67ecd8eb93d29d618bae1fa3a3c5d':
  DO NOT MERGE.  Fix issue #3000764: API REVIEW: android.R.*

...

This commit is contained in:

Dianne Hackborn

2010-09-24 18:10:18 -07:00

committed by Android Git Automerger

parent d66a3fe171 c388844d50

commit 960099572d

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

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

Diff Content Not Available