| commit | 6471a6faf5289fbd697548eddccf45b6e43148cc | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Sep 24 16:57:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 24 16:57:52 2014 +0000 |
| tree | 91191c026d1b936cc65022dcea8464d0d350a1b5 | |
| parent | c840e31d0ee772373b1be7469b7bfbe28715d52e [diff] | |
| parent | 1829a4b4d16e1bf37650e34ad6bbc54b68145e15 [diff] |
am 1829a4b4: (-s ours) Merge "Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE" * commit '1829a4b4d16e1bf37650e34ad6bbc54b68145e15': Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE