OSDN Git Service

am cd76f89f: (-s ours) am 6508fe1b: (-s ours) am d0642c42: Merge remote-tracking...
authorAnton Hansson <hansson@google.com>
Thu, 23 Oct 2014 19:49:43 +0000 (19:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Oct 2014 19:49:43 +0000 (19:49 +0000)
commitd223b88f0dbff7cd66876e691345df5c1ede242b
treecba62d0d64153aa2169651696bc238591341d679
parent69925bb1923f86f4b590962cdcd4299b98b9f30d
parentcd76f89f127b3a817f486ec14d76de9d79ecd5bb
am cd76f89f: (-s ours) am 6508fe1b: (-s ours) am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit 'cd76f89f127b3a817f486ec14d76de9d79ecd5bb':