tree 353632438c13c93449d60435096979bc75fd37f5
parent 5add7afb5c3ff1e6736bd9c015d5a54223027389
parent 43b8bcc0ed9628ec8923f939f647e46709cc88f4
author Susnata Basak <susnata@google.com> 1461708823 +0000
committer android-build-merger <android-build-merger@google.com> 1461708823 +0000

Merge "Fixing NPE + Compilation issue with Showcase sample app." into nyc-dev am: 32e05f3
am: 43b8bcc

* commit '43b8bcc0ed9628ec8923f939f647e46709cc88f4':

Change-Id: I78e99c056d06b4907234d2e04d5261299b27727d