tree 16eec5bbde22e0078df006c65b98c46616dba385
parent ccb83c0aa5f41be1bd3d15174488a4fdc2d1cfbe
parent e3dd9f8c71b8420d449bf45a93be140be9ecd471
author Keun-young Park <keunyoung@google.com> 1461798289 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461798291 +0000

Merge "fix recursion for config change" into nyc-dev