tree ce46c363948d998911b24d7f1031f950ed9f7fda
parent a9ba5e9d37657b0e6a5e90fdb72ad06c3ef72e0e
parent f19eec3091a404102a2b35da4353ee20b41fbecb
author Marco Nelissen <marcone@google.com> 1458337012 +0000
committer android-build-merger <android-build-merger@google.com> 1458337012 +0000

DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b  -s ours am: f5959b7  -s ours am: 1ba0a54 am: e26d4ee am: 5ff52d6  -s ours
am: f19eec3

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