| commit | a15e529f8c574b3f0802ed0000b2613f4616f849 | [log] [tgz] |
|---|---|---|
| author | Chris Banes <chrisbanes@google.com> | Mon Apr 25 14:01:46 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 25 14:01:46 2016 +0000 |
| tree | e6ef86e355b10fd66263bf6031c8494e0f869bd5 | |
| parent | c3dfc48873c0dcc6466890518c8a3a644a714344 [diff] | |
| parent | a4662f7986a54bb21f478b0c2ad8eaa197531d83 [diff] |
resolve merge conflicts of 4519642 to nyc-dev am: 5f5ffb9 am: a4a72ff am: a4662f7 * commit 'a4662f7986a54bb21f478b0c2ad8eaa197531d83': Tidy up DrawableCompat + VDC/AVDC calls Change-Id: I9285f2d83a9eff97447c8e681b3a3e7a8cb5477e