tree cba62d0d64153aa2169651696bc238591341d679
parent 2e124bc43dc148fd7d39f5d726738d2cdabf32ad
parent 9c114bb76edd1fe6bb0cc94b9e413495b7962887
author Adam Skory <skory@google.com> 1414093123 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414093123 +0000

am 9c114bb7: (-s ours) am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit '9c114bb76edd1fe6bb0cc94b9e413495b7962887':