| commit | ae6058363ce50bbd9f643bf5379d4eb0ac461ea6 | [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 | 98a44d75a79943b499210c32ab39200da6f182b4 | |
| parent | 2a3a2167b77729adc171cb04df00fb5947f0d7f4 [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: Ia55c3a32dcf67adbce0753fe3757d77768795bc3