| commit | 64c0c4da555f6d38b9c2516f855b49e6b501b783 | [log] [tgz] |
|---|---|---|
| author | Nicolas Prevot <nprevot@google.com> | Mon Jun 29 17:16:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 29 17:16:46 2015 +0000 |
| tree | 8a9b1b259c54b5f54cce510d3a4887829dfac1a5 | |
| parent | 08dfa1b45633d55da2d3da045f076dc4a6b4d58a [diff] | |
| parent | 6fd49936ae6b145cb2a9fe8b9ff75dcd79632daa [diff] |
am 6fd49936: Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev * commit '6fd49936ae6b145cb2a9fe8b9ff75dcd79632daa': Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING