tree 2d70b37e40d8816bb1cf0b324af60a21fa913feb
parent c44183f34353b6c5051e49e16ccdb4687dd807a8
parent 6d42f1ade3bde822535e75eebf634e6e3cf57efb
author Annie Chin <afchin@google.com> 1465344807 +0000
committer android-build-merger <android-build-merger@google.com> 1465344807 +0000

Merge \"Calculator multiwindow support.\" into ub-calculator-calculus
am: 6d42f1ade3

Change-Id: I6d0b5923852894e20989644aa62c332de0ac9968