| commit | 9e25c1da26bb11cac082ec0be59589ab7faea5a9 | [log] [tgz] |
|---|---|---|
| author | Ricardo Cervera <rcervera@google.com> | Fri Jan 16 18:29:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 16 18:29:25 2015 +0000 |
| tree | e60b700e8d8ccd177392af36d73ab65ce32fbeb8 | |
| parent | ee2acd4d2266c726a0282f71d79221741460da7f [diff] | |
| parent | 673f1ef7df5e0c5e64c7b14095e9f0e201c98c36 [diff] |
am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev * commit '93f94c2ca5bf23533fc5a9bd70a4795584d20618': docs: Added info on noHistory and onActivityResult(). Bug: 13807256