commit | e610d3dba8ea96636dd58ca4baa39dc9100467fd | [log] [tgz] |
---|---|---|
author | Wale Ogunwale <ogunwale@google.com> | Tue Apr 25 10:23:48 2017 -0700 |
committer | Wale Ogunwale <ogunwale@google.com> | Tue Apr 25 11:48:43 2017 -0700 |
tree | e8cee84ee86adee476c03bf5f949e1b021793812 | |
parent | a31f49a0df23ffbb27f018900a181693e6c32d9e [diff] |
Switch ActivityRecord last reported config. to MergeConfiguration Clean-up before actual fix for b/36897968 that makes the code easier to follow. Test: Existing tests pass Bug: 36897968 Change-Id: I3039548929440f922dc69d7f130169a3d60b1eef