commit | 4631f9174fcaad6f8ebb0470ddebfc919573fdae | [log] [tgz] |
---|---|---|
author | Chris Wren <cwren@android.com> | Mon Jan 11 17:01:44 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jan 11 17:01:44 2016 +0000 |
tree | 33046efafabc33d954cfcd14b0eddfa72e03027d | |
parent | 0052a166c4163add0743d4f8689f0b0e7df388cf [diff] | |
parent | c04a5df9c52fe026f1d0188eb092f12d0ad62505 [diff] |
am f114e3d9: am b1ad8e9e: Merge changes from topic \'tron\' into mnc-dev am: c04a5df9c5 * commit 'c04a5df9c52fe026f1d0188eb092f12d0ad62505':