tree fcf23a25aadc660bd2dbb8b5178da454e8a00f08
parent aa27d4ebde868c000b336df8066ca791fbb1cd75
parent af265461f1c56e3a7adc42f34032f45b8522722a
author Baligh Uddin <baligh@google.com> 1445311279 +0000
committer android-build-merger <android-build-merger@google.com> 1445311279 +0000

keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62 am: ce566c0e93 am: 1c30b578e1 am: 9fa7ca7d65 am: dcc908e147  -s ours
am: af265461f1

* commit 'af265461f1c56e3a7adc42f34032f45b8522722a':