| commit | 4a61eaf784fb085e66a21e9e4d4fa8aeb6b41c2b | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 12 08:00:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 12 08:00:53 2015 +0000 |
| tree | 0b1144f0dcccc225e4daacab60cc939f16308f8b | |
| parent | b6b9fe216d4dab6249e77870a02589e58d6bc59f [diff] | |
| parent | 1c24b3f110e0521a3840c3dfce9a86343fa02672 [diff] |
am 1c24b3f1: Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/" * commit '1c24b3f110e0521a3840c3dfce9a86343fa02672': Fix build, broken by https://android-review.googlesource.com/#/c/115890/