diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-06-11 16:56:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-11 16:56:04 -0700 |
| commit | 3a010fa6192f09121fc920810c5a8366b5b09f46 (patch) | |
| tree | 2ff19cd6195d9b911c22c46e4d26ddba67bba245 /include/media | |
| parent | 126ca6f9ecab6f912ea9f4f00af35c410aae504b (diff) | |
| parent | 1067e6895e941f56edc7bc3d7c16a7122fb5259b (diff) | |
| download | frameworks_base-3a010fa6192f09121fc920810c5a8366b5b09f46.zip frameworks_base-3a010fa6192f09121fc920810c5a8366b5b09f46.tar.gz frameworks_base-3a010fa6192f09121fc920810c5a8366b5b09f46.tar.bz2 | |
am 1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit '1067e6895e941f56edc7bc3d7c16a7122fb5259b' into gingerbread
* commit '1067e6895e941f56edc7bc3d7c16a7122fb5259b':
Doc change: remove pdf summary of guidelines from templates archive.
Diffstat (limited to 'include/media')
0 files changed, 0 insertions, 0 deletions