tree cba62d0d64153aa2169651696bc238591341d679
parent ee9d8dfdf3a70741d65d24515c69c827d0f1fd28
parent efaf2c857aac326df2051ac2c419be26bd3d5a6f
author Huy Nguyen <huynguyen@google.com> 1414103409 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414103409 +0000

am efaf2c85: am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit 'efaf2c857aac326df2051ac2c419be26bd3d5a6f':