tree 715507b19a32bbe340a9d1e4e5039f450b89dba7
parent 141ec1ff8bfb220521b09999bf97ff5a7af0f143
parent ab07b92dac9063bf05e98384e2834f0b06fb8382
author Sanket Padawe <sanketpadawe@google.com> 1437022866 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1437022880 +0000

Merge "Use a common multi tab settings file" into mnc-dev