tree b676cc16d379478e8afdf21b5e45d0f00b5ec741
parent bf3fccd078a94aa585ab0b84addeb47d80632df8
parent 514720e86b47c903acf47154ad5b2507a9bd6509
author Anton Hansson <hansson@google.com> 1445311794 +0000
committer android-build-merger <android-build-merger@google.com> 1445311794 +0000

am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568 am: cb168d34ae am: 616facd74b am: 4c5dbc52b3 am: ed0c3623a9 am: bf4e852f95 am: 5c02e22455 am: 982cbc361c am: b8ec169116 am: 70b9ea23ea
am: 514720e86b

* commit '514720e86b47c903acf47154ad5b2507a9bd6509':