| commit | 6f06704c3eaa15e2901c66d33c543249043a14ca | [log] [tgz] |
|---|---|---|
| author | nharold <nharold@google.com> | Tue Jan 30 19:52:22 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 30 19:52:22 2018 +0000 |
| tree | 4416dfcf3ada0ba7591cac8084e063e658936f75 | |
| parent | db410b1864f3d0d08e3a03b8005095407e04d163 [diff] | |
| parent | 0da9c9d5b99a952b9cc4bf02f6975607014065d1 [diff] |
Merge changes from topic "cherry-pick-cell-keepalive" am: 972b0961b5 am: 0da9c9d5b9 Change-Id: Ib4ba3f739a91ea2700611732f71afec0cc997ae4