tree 3a052cc076a585b6f9433fca6613dc63a30eabf8
parent 63e9ad3da10c554a2b142f1551e4a09e3d789f3d
parent 7836fa138ad141c374f0d0df2f042d94310db6eb
author Marco Nelissen <marcone@google.com> 1458339167 +0000
committer android-build-merger <android-build-merger@google.com> 1458339167 +0000

Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92  -s ours am: d92d909 am: 89036af am: 53af00c  -s ours am: 3af5111 am: a9ba5e9 am: 22c973a am: abb5726  -s ours
am: 7836fa1

* commit '7836fa138ad141c374f0d0df2f042d94310db6eb':
  DO NOT MERGE Don't reject "thumbnail mode" setConfig