tree a92ebf2fa37f75095fdb3c1cf49d78e049c246fc
parent 3af511170f505dae848fe3b71687ff7801b7f9aa
parent 5ff52d6e7ea3642a88d4ad181442ced2a3f67845
author Marco Nelissen <marcone@google.com> 1458336874 +0000
committer android-build-merger <android-build-merger@google.com> 1458336874 +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

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