am c7b60925: (-s ours) am 1baa142c: do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch

Browse Source

* commit 'c7b60925d7ef7f6825bbb338f476198669a2b5c4':
  do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch

...

This commit is contained in:

Yu Shan Emily Lau

2011-11-09 21:50:48 +00:00

committed by Android Git Automerger

parent e23a6af2d0 c7b60925d7

commit c2837c2f34

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