| commit | adfd07d5bbae34c50db7b744d55cf53116e72412 | [log] [tgz] |
|---|---|---|
| author | Adam Koch <akoch@google.com> | Tue May 13 15:19:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 15:19:22 2014 +0000 |
| tree | d593cb34b8e2adbe2c14ae99554c7d5824f3cbed | |
| parent | 6a6d48930f58127e312008e0abd8741c1a2df53b [diff] | |
| parent | a5dba95f6ba28265eaa53590402794cf13798573 [diff] |
am a5dba95f: am afe9bac9: am 4d5a7ace: am 87bd56ff: am 3a09d75f: am bdd20c5c: Merge "Remove bitmapfun code sample (it has moved to samples framework)." into klp-docs * commit 'a5dba95f6ba28265eaa53590402794cf13798573':