| commit | e3d8737d9156389cbc9d84b60a21650fa0078d64 | [log] [tgz] |
|---|---|---|
| author | Chris Banes <chrisbanes@google.com> | Thu Apr 28 14:17:05 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 28 14:17:05 2016 +0000 |
| tree | d9f4521ecd1392adb6c542578988909dd46c6b42 | |
| parent | a69f2e46873ef287893f6dac0862189c4b3ec11b [diff] | |
| parent | 4abb8c027976115afd6b38615412e185fa7eec7a [diff] |
Merge "resolve merge conflicts of 19ec6b7 to nyc-dev" into nyc-dev am: 4abb8c0 * commit '4abb8c027976115afd6b38615412e185fa7eec7a': Allow back presses to work in FragmentActivity Change-Id: I3ed1feb0207ec0bcb678bc94792dc06ff1ea9a32