| commit | 2ce803790f05122cef713ae9cfe25de520d288c1 | [log] [tgz] |
|---|---|---|
| author | Android Merger <android-build-merger@google.com> | Wed Jun 07 23:34:25 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Jun 07 23:34:27 2017 +0000 |
| tree | d071836ca0cba1a0fa04405dd26eab8bd5fe4994 | |
| parent | 2fe51274dbb49e421d36b22c42d46c089dfa1d52 [diff] | |
| parent | dd6f5aa49fb3ff46073c0c7129db8223f0d00fbf [diff] |
Merge changes from topic 'am-6d94399fe9a54e68bb328faaf8347068' into marshmallow-cts-dev * changes: Merge changes from topic 'l1' into lollipop-mr1-cts-dev am: 39f07025c5 DO NOT MERGE: StagefrightTest: add test for bug 22771132 am: ecfa904f0a -s ours