| commit | 7118d9dd17f51d998440f257935d6670c927383f | [log] [tgz] |
|---|---|---|
| author | Mathew Inwood <mathewi@google.com> | Thu Oct 23 20:51:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 20:51:24 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | ede7e7e3188e3c1ff56ed2bd25e2462fba1bdce9 [diff] | |
| parent | d6518c4b9569ddf9a8d66e4e60dc77c18e0ecb05 [diff] |
am d6518c4b: (-s ours) am 48e725bd: (-s ours) am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release * commit 'd6518c4b9569ddf9a8d66e4e60dc77c18e0ecb05':