| commit | bfad435c8557ba2f6706bf52a1fbe810f8294930 | [log] [tgz] |
|---|---|---|
| author | Alice Yang <alice@google.com> | Tue Mar 19 18:49:20 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 19 18:49:20 2013 +0000 |
| tree | 74a39d4284bfa8006d1fa3b796d46e410613ddfd | |
| parent | c494d535894da28f32e95e79ea0cfc5814d1fe75 [diff] | |
| parent | b0c23f29a77e4f7f90807119a38069533c32ef58 [diff] |
am b0c23f29: (-s ours) am 9860d23d: (-s ours) DO NOT MERGE: Fix NPE in PhotoViewActivity * commit 'b0c23f29a77e4f7f90807119a38069533c32ef58': DO NOT MERGE: Fix NPE in PhotoViewActivity