tree 623ba1a52d799a96955ba1d8171ac349d4d809c5
parent 0b3d12aadf69198d890aa32e8d9717db8e49633b
parent 2bd62b53b68834cabb48be608ee350012b1e8043
author Christoph Studer <chstuder@google.com> 1418754873 +0000
committer android-build-merger <android-build-merger@google.com> 1418754873 +0000

am 88fb463e: am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev
automerge: 2bd62b5

* commit '2bd62b53b68834cabb48be608ee350012b1e8043':
  Fix MediaStyle docs mentioning 2 max actions in compact view