tree cba62d0d64153aa2169651696bc238591341d679
parent 0ef051bd3da6b7b6dffbbf6251e15cad2eaef574
parent 3a540fc85a889e530966d543d53d637b26313961
author Adam Skory <skory@google.com> 1414092783 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414092783 +0000

am 3a540fc8: am 77ef6b2b: am 381fa3fb: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release

* commit '3a540fc85a889e530966d543d53d637b26313961':