| commit | 8263b3baee3bf40ac69dc8a74d017ce5be6c906e | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Apr 28 14:20:28 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 28 14:20:28 2016 +0000 |
| tree | 98a44d75a79943b499210c32ab39200da6f182b4 | |
| parent | d844ff821dff3abb5ffc485da336a3e504333c4e [diff] | |
| parent | ae6058363ce50bbd9f643bf5379d4eb0ac461ea6 [diff] |
Merge "resolve merge conflicts of 19ec6b7 to nyc-dev" into nyc-dev am: 4abb8c0 am: ae60583 * commit 'ae6058363ce50bbd9f643bf5379d4eb0ac461ea6': Allow back presses to work in FragmentActivity Change-Id: Ic4259d1a3a74c40b1ca4fe46112fc999550ac587