| commit | a3e74b9e2af780a6395d89e10121fb9d72852e2c | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jun 14 17:09:01 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 14 17:09:01 2012 -0700 |
| tree | 371f07dcdde04701d587cb9751214b6d5b1d2b9f | |
| parent | 103c5b04d678212a25d52301d0b4062b93f9e945 [diff] | |
| parent | e0279d33974a095b12abfe33f3e0be84b5e7b7d0 [diff] |
am e0279d33: resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp * commit 'e0279d33974a095b12abfe33f3e0be84b5e7b7d0': Gallery2: Check privative effects