| commit | d223b88f0dbff7cd66876e691345df5c1ede242b | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Thu Oct 23 19:49:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 19:49:43 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | 69925bb1923f86f4b590962cdcd4299b98b9f30d [diff] | |
| parent | cd76f89f127b3a817f486ec14d76de9d79ecd5bb [diff] |
am cd76f89f: (-s ours) am 6508fe1b: (-s ours) am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release * commit 'cd76f89f127b3a817f486ec14d76de9d79ecd5bb':