| commit | 5e88177ecbfb0b9e3ca84d1168aed192e31d2c68 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri Nov 21 18:27:52 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 21 18:27:52 2014 +0000 |
| tree | a064fb6b0cc589ad6abb706aa4988e6bbc2baf24 | |
| parent | c7cf8cca6b61d42604efa75729e22088439fc141 [diff] | |
| parent | 935fd8d0b1c7953e6e6610aea0c2d09d0fa8ba97 [diff] |
Merge "resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp automerge: 935fd8d * commit '935fd8d0b1c7953e6e6610aea0c2d09d0fa8ba97': Frameworks/base: Wall Werror in media/tests