am 2d40f625: (-s ours) Merge "DO NOT MERGE Fix build." into jb-mr1-dev-plus-aosp

Browse Source

* commit '2d40f625c457d93cd7fabb0ca8ea360519f40da9':
  DO NOT MERGE Fix build.

...

This commit is contained in:

Elliott Hughes

2013-01-17 11:34:23 -08:00

committed by Android Git Automerger

parent 0f8d155363 2d40f625c4

commit ebf724b641

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