| commit | 3179911e2d178b8a699b00e315ef377b235d2dc1 | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Fri Mar 20 23:50:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:50:37 2015 +0000 |
| tree | 2f6a1957b35de5e015485eb137b262323634cbc8 | |
| parent | 3898094f56921c1b785add876fbf806b36997f59 [diff] | |
| parent | ea765de0b5bfa8d1d29534c4e8500cdc66e4b5e6 [diff] |
am ea765de0: am c2aa6971: Merge "[AU]Sync libmedia/Android.mk modification from KLP-Sprout" into lmp-dev * commit 'ea765de0b5bfa8d1d29534c4e8500cdc66e4b5e6':