tree 94303f28a3a4d89a2fd36519a58dd937283b9c22
parent 37090fad728bff61acd0cf8fdcafef30b67e80de
parent 22c973a8acb8ebef31a8d5803cf942defec8a6e4
author Marco Nelissen <marcone@google.com> 1458337341 +0000
committer android-build-merger <android-build-merger@google.com> 1458337341 +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

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