| commit | 91fa21a608148f64fa0973b9402d03f09c5a5018 | [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 | c32f357ed7429d222fa59f16c7f0513b1524d9f1 | |
| parent | 8e191e826d835d596ae2270f2e14689960f1178e [diff] | |
| parent | ac9ae4fd0a4ff040fd9cc0c62691be2ef927c1a4 [diff] |
am e0279d33: resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp * commit 'e0279d33974a095b12abfe33f3e0be84b5e7b7d0': Gallery2: Check privative effects