tree 0eb9150b879607676e1a515f47b7d11105da91db
parent 81361a50f06f0f173f754655fadc3638b8d19ade
parent a9ba5e9d37657b0e6a5e90fdb72ad06c3ef72e0e
author Marco Nelissen <marcone@google.com> 1458337190 +0000
committer android-build-merger <android-build-merger@google.com> 1458337190 +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

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