| commit | e6073afeeadada2e4440b1a921c0fad4cb287c24 | [log] [tgz] |
|---|---|---|
| author | Sascha Häberling <haeberling@google.com> | Fri Mar 21 10:05:02 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 21 10:05:02 2014 -0700 |
| tree | 290bdf7fda35f1d6c64d36184606ddf4ba510f1b | |
| parent | a063688b64705a860d8553ed5583918ea031b839 [diff] | |
| parent | 74b139ed4bb6845ba3dff4231e93c89e3d94bdba [diff] |
am 74b139ed: Merge "fix the build" into gb-ub-photos-denali * commit '74b139ed4bb6845ba3dff4231e93c89e3d94bdba': fix the build