am 99b70f3f: (-s ours) DO NOT MERGE cherrypick from master Change-Id: I63bc055991405c56e9dcc83a54b106b870cf6b29

Browse Source

* commit '99b70f3f5d051261229d1792c169a374fc23326b':
  DO NOT MERGE cherrypick from master Change-Id: I63bc055991405c56e9dcc83a54b106b870cf6b29

...

This commit is contained in:

Joe Fernandez 2011-10-12 14:39:58 -07:00 committed by Android Git Automerger

parent 5e412a0f7d 4336560726

commit d16b0945e2

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