am 1829a4b4: (-s ours) Merge "Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE"

Browse Source

* commit '1829a4b4d16e1bf37650e34ad6bbc54b68145e15':
  Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE

...

This commit is contained in:

Bill Yi

2014-09-24 16:57:52 +00:00

committed by Android Git Automerger

parent c840e31d0e 1829a4b4d1

commit 6471a6faf5

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