summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove ExternalMediaFormatActivity" into mnc-devRubin Xu2015-07-024-128/+0
|\
| * Remove ExternalMediaFormatActivityRubin Xu2015-07-024-128/+0
| | | | | | | | | | | | | | This activity is no longer used by any part of the framework. Bug: 9433509 Change-Id: Iace394b7a11b75ed75b2eefc05990626a7e68ac2
* | Merge "Clear "profile wiped" notification when a new porfile is created" ↵Alex Chau2015-07-021-0/+9
|\ \ | |/ |/| | | into mnc-dev
| * Clear "profile wiped" notification when a new porfile is createdAlex Chau2015-06-301-0/+9
| | | | | | | | | | | | | | | | Make use of ACTION_MANAGED_PROFILE_ADDED to clear the notification. Bug: 22186884 Change-Id: I08514ebc308f2e2fb61f837500e2ba712ccf8703
* | Merge "In NfcActivityManager, don't use UserHandle.CURRENT." into mnc-devNicolas Prevot2015-07-021-1/+1
|\ \
| * | In NfcActivityManager, don't use UserHandle.CURRENT.Nicolas Prevot2015-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | In the work profile, UserHandle.CURRENT refers to the primary user. We want to refer to the work profile itself. So, using new UserHandle(UserHandle.myUserId()) instead. BUG:21960385 Change-Id: I4d880ccf6926e437d674874295029b29278f3e12
* | | Merge "Fix the case where an intent bounces several times between users." ↵Nicolas Prevot2015-07-023-5/+9
|\ \ \ | | | | | | | | | | | | into mnc-dev
| * | | Fix the case where an intent bounces several times between users.Nicolas Prevot2015-07-013-5/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | An intent may bounce several times between users. In this case, we want mContentUserHint to refer to the original user. BUG:19656340 Change-Id: I22a35fab0c228140dcb223899f5e38ff33ee5aed
* | | am 2ebfc3f7: am fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. ↵David Friedman2015-07-0236-5/+11584
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20503708" into mnc-preview-docs * commit '2ebfc3f78483842c789688da47b721f60b4149e4': Docs: Localization of Design pages on DAC. Bug: 20503708
| * \ \ am fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. Bug: ↵David Friedman2015-07-0236-5/+11584
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20503708" into mnc-preview-docs * commit 'fa8eb1e0d42e7b10447a285d9b2a583d367c3cad': Docs: Localization of Design pages on DAC. Bug: 20503708
| | * \ \ Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into ↵David Friedman2015-07-0236-5/+11584
| | |\ \ \ | | | | | | | | | | | | | | | | | | mnc-preview-docs
| | | * | | Docs: Localization of Design pages on DAC.David Friedman2015-07-0136-5/+11584
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20503708 Change-Id: Id3a4f5900d99125a1475d939d43444f46555018c
* | | | | | am 5adc6ba0: am 7e4dc922: Merge "Docs: Fixes a terminology error in ↵David Friedman2015-07-0210-215/+215
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplified Chinese on-boarding docs" into mnc-preview-docs * commit '5adc6ba056de056f73ee484b859b45657da0c1fb': Docs: Fixes a terminology error in simplified Chinese on-boarding docs
| * | | | | am 7e4dc922: Merge "Docs: Fixes a terminology error in simplified Chinese ↵David Friedman2015-07-0210-215/+215
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on-boarding docs" into mnc-preview-docs * commit '7e4dc922d949c7aec0a2a813e9487067e47e4c51': Docs: Fixes a terminology error in simplified Chinese on-boarding docs
| | * | | | Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding ↵David Friedman2015-07-0210-215/+215
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | docs" into mnc-preview-docs
| | | * | | | Docs: Fixes a terminology error in simplified Chinese on-boarding docsDavid Friedman2015-07-0110-215/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib0ba3d449e78a0a69c0f704399b3865380bfcc8f
* | | | | | | Merge "Add accessibility actions for the PROCESS_TEXT feature." into mnc-devAbodunrinwa Toki2015-07-022-38/+145
|\ \ \ \ \ \ \
| * | | | | | | Add accessibility actions for the PROCESS_TEXT feature.Abodunrinwa Toki2015-06-292-38/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also refactored the code so that PROCESS_TEXT-related code is shared by menu item actions and accessibility actions. Bug: 21890235 Change-Id: Ie932fa9bb5cd3d8bd29f8c82695f3c7490693cbd
* | | | | | | | am b85962df: am e155eef4: am 2735ac71: am 22cd16a0: am bc4743eb: am ↵Wale Ogunwale2015-07-020-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev * commit 'b85962df1ee6be2bba4c26fbd0964ade2c73a9c9': Prevent system uid component from running in an app process
| * | | | | | | am e155eef4: am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am ↵Wale Ogunwale2015-07-020-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev * commit 'e155eef4881c1ec8063a62619fe29aa6e8074b71': Prevent system uid component from running in an app process
| | * \ \ \ \ \ \ am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am ↵Wale Ogunwale2015-07-020-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev * commit '2735ac71e6d8d1c00b95104057ac9365abb485d9': Prevent system uid component from running in an app process
| | | * \ \ \ \ \ \ am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am ↵Wale Ogunwale2015-07-020-0/+0
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev * commit '22cd16a01f55149507c1d5d71c408987a71737fc': Prevent system uid component from running in an app process
| | | | * \ \ \ \ \ \ am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am ↵Wale Ogunwale2015-07-020-0/+0
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev * commit 'bc4743ebe845958fab8bbb0d0a425d55ece3d205': Prevent system uid component from running in an app process
| | | | | * \ \ \ \ \ \ am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge ↵Wale Ogunwale2015-07-020-0/+0
| | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Prevent system uid component from running in an app process" into klp-dev * commit '7ab264abc214b7e1b7fff9934814020cea5f18fa': Prevent system uid component from running in an app process
| | | | | | * \ \ \ \ \ \ am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system ↵Wale Ogunwale2015-07-010-0/+0
| | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uid component from running in an app process" into klp-dev * commit '742bfa809cf2c022d690f84b4213e908ee66e8aa': Prevent system uid component from running in an app process
| | | | | | | * \ \ \ \ \ \ am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component ↵Wale Ogunwale2015-07-010-0/+0
| | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from running in an app process" into klp-dev * commit 'f3dbb57ee8fce4b7c2cad352ebe5096a880ae06b': Prevent system uid component from running in an app process
| | | | | | | | * \ \ \ \ \ \ am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running ↵Wale Ogunwale2015-07-011-3/+8
| | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in an app process" into klp-dev * commit 'c215b2b24575e6d7693f396c7fdfe675d5ea9d1c': Prevent system uid component from running in an app process
| | | | | | | | | * \ \ \ \ \ \ am dc9cfca8: Merge "Prevent system uid component from running in an app ↵Wale Ogunwale2015-07-011-3/+8
| | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | process" into klp-dev * commit 'dc9cfca80139714ca37122148d041beedbf0ceb2': Prevent system uid component from running in an app process
| | | | | | | | | | * \ \ \ \ \ \ Merge "Prevent system uid component from running in an app process" into klp-devWale Ogunwale2015-07-011-3/+8
| | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | * | | | | | | Prevent system uid component from running in an app processWale Ogunwale2015-06-251-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21669445 Change-Id: I792c6e676d4b6d54a51228d264130b8125075d98
* | | | | | | | | | | | | | | | | | am 2adcfa1c: am 657d20ee: am 44000724: am 5278cea1: am d72dc762: am ↵Wale Ogunwale2015-07-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev * commit '2adcfa1c02ecc695b86b8b11c1c4eb9891d4337e': Prevent system uid component from running in an app process
| * | | | | | | | | | | | | | | | | am 657d20ee: am 44000724: am 5278cea1: am d72dc762: am ec425a19: am ↵Wale Ogunwale2015-07-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev * commit '657d20ee575f75beeb6a8419e07f3cb3960423fa': Prevent system uid component from running in an app process
| | * | | | | | | | | | | | | | | | am 44000724: am 5278cea1: am d72dc762: am ec425a19: am df9948d8: Merge ↵Wale Ogunwale2015-07-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Prevent system uid component from running in an app process" into lmp-dev * commit '44000724ef630182579004939d0c064664d9d3f2': Prevent system uid component from running in an app process
| | | * | | | | | | | | | | | | | | am 5278cea1: am d72dc762: am ec425a19: am df9948d8: Merge "Prevent system ↵Wale Ogunwale2015-07-010-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uid component from running in an app process" into lmp-dev * commit '5278cea1f35b2b54606cc1bb78195bd2f84953da': Prevent system uid component from running in an app process
| | | | * | | | | | | | | | | | | | am d72dc762: am ec425a19: am df9948d8: Merge "Prevent system uid component ↵Wale Ogunwale2015-07-010-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from running in an app process" into lmp-dev * commit 'd72dc76275d7d0cc9559e0e5439bcc3ccbda81a2': Prevent system uid component from running in an app process
| | | | | * | | | | | | | | | | | | am ec425a19: am df9948d8: Merge "Prevent system uid component from running ↵Wale Ogunwale2015-07-010-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in an app process" into lmp-dev * commit 'ec425a19f973e2511485b61424dffb9f3cafb542': Prevent system uid component from running in an app process
| | | | | | * | | | | | | | | | | | am df9948d8: Merge "Prevent system uid component from running in an app ↵Wale Ogunwale2015-07-011-3/+8
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | process" into lmp-dev * commit 'df9948d81232a03271113c16bee6f3ab6b826bad': Prevent system uid component from running in an app process
| | | | | | | * | | | | | | | | | | Merge "Prevent system uid component from running in an app process" into lmp-devWale Ogunwale2015-07-011-3/+8
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | | | Prevent system uid component from running in an app processWale Ogunwale2015-06-241-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21669445 Change-Id: I11d0bc5301d7e2a64972221f54f3cbd611f8e404 (cherry picked from commit 44368567f840e3469b5fd2c9399ed444b6f46ebf)
* | | | | | | | | | | | | | | | | | | am 655b08c3: am b6f87997: am f54d1722: am 52034328: am 131e6b24: Merge ↵Wale Ogunwale2015-07-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Prevent system uid component from running in an app process" into lmp-mr1-dev * commit '655b08c38a08d9adb35b75cf340d70068ba81204': Prevent system uid component from running in an app process
| * | | | | | | | | | | | | | | | | | am b6f87997: am f54d1722: am 52034328: am 131e6b24: Merge "Prevent system ↵Wale Ogunwale2015-07-021-3/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uid component from running in an app process" into lmp-mr1-dev * commit 'b6f87997cb6ea557dc84e77c18c5bb22f99411fc': Prevent system uid component from running in an app process
| | * | | | | | | | | | | | | | | | | am f54d1722: am 52034328: am 131e6b24: Merge "Prevent system uid component ↵Wale Ogunwale2015-07-021-3/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from running in an app process" into lmp-mr1-dev * commit 'f54d17224bada1d852ba7c9d4bb9e2a792c0093b': Prevent system uid component from running in an app process
| | | * | | | | | | | | | | | | | | | am 52034328: am 131e6b24: Merge "Prevent system uid component from running ↵Wale Ogunwale2015-07-011-3/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in an app process" into lmp-mr1-dev * commit '52034328081e8c3420f9228192343835465afa13': Prevent system uid component from running in an app process
| | | | * | | | | | | | | | | | | | | am 131e6b24: Merge "Prevent system uid component from running in an app ↵Wale Ogunwale2015-07-011-3/+8
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | process" into lmp-mr1-dev * commit '131e6b24d88c4704687f41e9a016ab1919c53fa4': Prevent system uid component from running in an app process
| | | | | * | | | | | | | | | | | | | Merge "Prevent system uid component from running in an app process" into ↵Wale Ogunwale2015-07-011-3/+8
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | | | | * | | | | | | | | | | | | | Prevent system uid component from running in an app processWale Ogunwale2015-06-241-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21669445 Change-Id: I11d0bc5301d7e2a64972221f54f3cbd611f8e404 (cherry picked from commit 44368567f840e3469b5fd2c9399ed444b6f46ebf)
* | | | | | | | | | | | | | | | | | | | am aabc9869: am 03850591: Handle outsets when resized is called due to rotation.Filip Gruszczynski2015-07-022-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aabc9869a95928660271b7022e2756fff2654013': Handle outsets when resized is called due to rotation.
| * | | | | | | | | | | | | | | | | | | am 03850591: Handle outsets when resized is called due to rotation.Filip Gruszczynski2015-07-022-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '03850591954faf5280fd581dd04cd6958eda0124': Handle outsets when resized is called due to rotation.
| | * | | | | | | | | | | | | | | | | | Handle outsets when resized is called due to rotation.Filip Gruszczynski2015-07-012-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rotation might change while the wallpaper is displayed. If outsets are present, this must trigger a resized callback and the wallpaper must take these accounts immediately into account before requesting relayout. Bug: 22209764 Change-Id: I97f2670f384ccac792e7c2727eb0ef017ec66188
* | | | | | | | | | | | | | | | | | | | am 429b9afd: am 0de59080: Merge "Docs: Fixes metadata that was getting ↵David Friedman2015-07-023-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mangled in jd_lists_unified file." into mnc-preview-docs * commit '429b9afd8f1a6a230754cb8567927c3cf4843931': Docs: Fixes metadata that was getting mangled in jd_lists_unified file.