| commit | 7c2f8b47cfb44bdb4cbdd05f081d5017a820e833 | [log] [tgz] |
|---|---|---|
| author | Huy Nguyen <huynguyen@google.com> | Thu Oct 23 22:30:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 22:30:01 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | 29923f5082093b6211894f49edc653c29b28d99b [diff] | |
| parent | 9e5d50c6de67b17c01b486a66e3c25070b456ebc [diff] |
am 9e5d50c6: (-s ours) am 49635c71: (-s ours) am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release * commit '9e5d50c6de67b17c01b486a66e3c25070b456ebc':