tree 59d236a3d66d9ff2efe43dc7fcc19c0b86cc6fa6
parent 02b9ecfbbdc7cc962287813d43c5fe20bdb81aa8
parent e385ee38bc1e0cb3a16427bae9044258b81d4773
author Cassie Han <xih@google.com> 1522778251 -0700
committer android-build-merger <android-build-merger@google.com> 1522778251 -0700

[automerger skipped] Merge "Modify the Manual-selct UI according to Phase 3 UX review." am: 6f04e01e24
am: e385ee38bc  -s ours

Change-Id: I34d3fec9c3a35c3cbbb789b44a5f4ec1d589bd48